removed commented out code
added spaces around +/*
fixed some space issues and converted all to 4-space indentation