Removed comments and testing logs
Major improvements by Vlad Martynas and Raluca.