Cleaned up look a little bit