cleaned up the code a bit - more human-readable