Feedback fixes to clean the code a bit