last commit before presentation, code cleanup and removed lib shit