cleanup and refactoring
used bower for libs