Improved slightly - fixed issues + cleaned up