Cleaned up spacing and stuff