Made sure that the code is always trimmed down