cleaned up code... a little