Cleaned up working