General code cleanup
Started implementing defaults
Added default values
Code cleanup
Version 0.0.11