Cleaned up, Version 0.3.5