* Cleaned up the last commit's code a bit