Cleaned up some nick stuff a little