Cleaned up a litle