Cleaned up things a bit