removing build directory from list
Code cleaning (mostly in View)