Cleaned up further