Removed debug code, tweaked styles