Work in progress
Code cleaning