Advice needed: How to make it cleaner?