Cleaned up, ready for Linux