Removed legacy comments, converted tabs to spaces