#5: Cleaned up code