[Related to #25] Cleaning up