Cleaned up, removed some warnings