Cleaned up code :beer: