Final updates to the project. Removing warnings and making the code more clean.