Removed some blackspaces, unused lines