Cleaned up. Packed in functions.