Little cleaned up