Cleaned up some code...