Cleaned up week 2