Cleaned up. Please by gentle~