Cleaned up these a bit too