Cleaned up code. Mainily just shortening lines