Removed silly comma
At least try to reduce size
Style fix
large parts of the clusterfuck cleaned