Cleanup code + comments