Cleaned up..