updated styling and code cleanup, moved code around deleted some unused code