Cleaned up a bit more. Silenced some compiler warnings