Cleaned and refactored sources of project