Cleaned up nice; )