Cleaned up the code a bit more from the previous edit