Cleaning the code for beans, it still looks awful though.
Still working on beans