Cleaned up assets directory
Improved key handling