Cleaned up code. Another test