Cleaned it up:)