Cleaned up, ready for alpha version