Cleaned Up Code.