Managed whitespacing and comments; updated components