Version 0.4: Cleaned up code in /lib