Eager Loading and some cleaning