Cleaned it up very much