Modularisation: Cleaned up file module #12