Cleaned up some :)