Simplifying things

Currently under reconstruction, thanks for your patience.