removed comments + general cleanup